From: OpenJDK Team <openjdk-25@packages.debian.org>
Date: Thu, 24 Sep 2026 07:52:19 +0000 (+1200)
Subject: Misalign address in the test rather than structure
X-Git-Tag: archive/raspbian/25.0.5_7ea-1+rpi1~23
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6880ac53d8bd87e518b5eca21df71bf636324092;p=openjdk-25.git

Misalign address in the test rather than structure

mk68-support.diff aligned metaspace structures by 4 bytes breaking the test.
Add 1 to address type rather than aligned structure to produce misaligned pointer.

Gbp-Pq: Name misalign-pointer-for-armhf.patch
---

diff --git a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
index a35888c62..55f8903b3 100644
--- a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
+++ b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp
@@ -60,7 +60,7 @@ public:
     ASSERT_TRUE(MetaspaceObj::is_valid(p));
 
     // A misaligned object shall not be recognized
-    const MetaspaceObj* p_misaligned = (MetaspaceObj*)((address)p) + 1;
+    const MetaspaceObj* p_misaligned = (MetaspaceObj*)((address)p + 1);
     ASSERT_FALSE(MetaspaceObj::is_valid(p_misaligned));
 
     // Test VirtualSpaceList::contains
@@ -71,7 +71,7 @@ public:
     ASSERT_TRUE(vslist->contains((MetaWord*)p));
 
     // A misaligned pointer shall still be recognized by list::contains
-    ASSERT_TRUE(vslist->contains((MetaWord*)((address)p) + 1));
+    ASSERT_TRUE(vslist->contains((MetaWord*)((address)p + 1)));
 
     // Now for some bogus values
     ASSERT_FALSE(MetaspaceObj::is_valid((MetaspaceObj*)nullptr));